Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 25 Jun 2010 03:34:29 +0000 (03:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 25 Jun 2010 03:34:29 +0000 (03:34 +0000)
commite4edbaa7d75479d72f6b3336e9054aaa3c4733c3
tree9b50b829e606985144197fcac04b59919141c993
parentabfac02b31be0dc183e61229dc798c46f0eab29e
parent52d21a3c28ccb9c91ebf0d7a581b4f484be8f182
Merge from mainline.